; Set Transient's version

; Fix typos in 'which-key-mode' (bug#72093)

* lisp/which-key.el (which-key-preserve-window-configuration):
Correct spelling of "taken".
(which-key--create-pages): Correct spelling of "widths".
(which-key--start-paging-timer): Correct spelling of
"secondary".

; * src/w32fns.c (Fw32_notification_close): Fix typo (bug#72091).

* test/lisp/wdired-tests.el (wdired-test-bug34915): Fix for MS-Windows.

Fix 'wdired-test-unfinished-edit-01'

* test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01):
Don't modify the random directory name if, by chance, it happens
to contain the substring "foo" anywhere but immediately after the
slash.  (Bug#72073)

; * src/search.c (Fre_search_forward): Clarify doc string (bug#71879).

Fontify destructor in c++-ts-mode

* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings):
Add a rule for destructors.  (Bug#71872)

Fix invalid defcustom type for erc-buffers option

* lisp/erc/erc.el (erc-ensure-target-buffer-on-privmsg): Change
invalid inner `choice' to a `const' for the third-state `status'
variant, which is new in ERC 5.6 and Emacs 30.  Thanks to Mattias
Engdegård for catching this.

; Fix 'ibuffer-do-isearch{-regexp}'

* lisp/ibuf-ext.el (ibuffer-do-isearch)
(ibuffer-do-isearch-regexp): Use 'defun' instead of
'define-ibuffer-op'.  (Bug#71927)

Fix infloop in 'shell-resync-dirs'

* lisp/shell.el (shell-eval-command): Fix detection of newline
after last output line.  (Bug#71896)
(shell-resync-dirs): Make sure the inner loop never infloops.
Suggested by Troy Hinckley <troyhinckley@dabrev.com>.

; * src/image.c (free_image_cache): Add assertion.  (Bug#71929)

Render more Android functions safe to execute in a batch session

* src/androidfns.c (Fx_display_mm_width, Fx_display_mm_height)
(Fandroid_display_monitor_attributes_list)
(Fandroid_external_storage_available_p)
(Fandroid_request_storage_access): Verify that a display
connection or service object is available.

* src/androidselect.c (Fandroid_get_clipboard)
(Fandroid_browse_url_internal, Fandroid_get_clipboard_targets)
(Fandroid_get_clipboard_data, Fandroid_notifications_notify):
Moderate tone of error messages.

Document means of executing Emacs from unrelated Android applications

* doc/emacs/android.texi (Android Environment): Document
significance, effect and purpose of EMACS_CLASS_PATH and
EMACS_LD_LIBRARY_PATH, and the utility of `pm path
org.gnu.emacs'.

Don't emit a prompt in Eshell when a background command is killed

* lisp/eshell/esh-cmd.el (eshell-resume-command): Check for
background-ness before resetting the prompt.

* test/lisp/eshell/esh-cmd-tests.el
(esh-cmd-test/background/simple-command): Make the regexp a bit
stricter.
(esh-cmd-test/background/kill): New test.

Fix reference from buffer-stale-function docstring

* lisp/files.el (buffer-stale-function): Fix reference to a
non-existent Info node in doc string.  (Bug#72049)

Take precautions against ill-formed content URIs

* java/org/gnu/emacs/EmacsService.java (openContentUri)
(checkContentUri): Verify that URIs derived from user-provided
file names can be parsed before attempting to open them.

etags-regen-mode: Handle TAGS buffer being killed

* lisp/progmodes/etags-regen.el (etags-regen--visit-table):
Use kill-buffer-hook to ensure a refresh if the TAGS buffer is
killed manually (bug#71727).
(etags-regen--tags-cleanup):
Bind the hook var to nil to avoid an infloop.

; Tag ERC multiline blanks test as :expensive

* test/lisp/erc/erc-tests.el
(erc--check-prompt-input-for-multiline-blanks): Move message-capturing
business outside of primary fixture.  Extend subprocess sleep duration
to 5m.  Delete some unreachable code.  (Bug#72004)

Improve 'put-image' documentation

* doc/lispref/display.texi (Showing Images): Mention that it returns the
created overlay.
* lisp/image.el (put-image): And here.

Improve 'set-fontset-font' documentation

* doc/emacs/mule.texi (Modifying Fontsets): Add an 'emoji' example.

Adapt Tramp's "run0" method

* doc/misc/tramp.texi (Inline methods):
* etc/NEWS: Adapt "run0" entry.

* lisp/net/tramp-sh.el (tramp-enable-run0-method): Adapt "run0"
arguments.

* test/src/sqlite-tests.el (sqlite-execute-batch): Declare to wave warning.

Capitalize "Dired" and "Lisp" in docstrings

* lisp/desktop.el (desktop-no-desktop-file-hook):
* lisp/dired-x.el (dired-mark-sexp):
* lisp/dired.el (dired-make-directory-clickable)
(dired-map-over-marks, dired-file-name-at-point)
(dired-save-positions, dired-buffers-for-dir)
(dired-buffers-for-dir-or-subdir, dired-fun-in-all-buffers)
(dired-remove-entry, dired-delete-entry, dired-jump):
* lisp/files.el (save-buffer):
* lisp/find-dired.el (find-ls-option):
* lisp/hilit-chg.el:
* lisp/locate.el (locate-mode):
* lisp/msb.el (msb-dired-item-handler, msb-sort-by-directory):
* lisp/printing.el (pr-ps-printer-alist, pr-ps-utility-alist):
* lisp/uniquify.el (uniquify-trailing-separator-p):
* lisp/wdired.el (wdired, wdired-change-to-dired-mode, wdired-exit):
* lisp/woman.el (woman-dired-define-keys, woman-dired-find-file):
Capitalize "Dired" and "Lisp" in docstrings.  Found with checkdoc.

Document Eshell entry points

* doc/misc/eshell.texi (Entry Points): New chapter.
(Scripts): Move under Entry Points.  Expand documentation.

Fix bug#71929

* src/image.c (free_image_cache): Unconditionally release image
cache, as this function is only called with its existence
already established.

* src/xfaces.c (free_frame_faces): Clear FRAME_IMAGE_CACHE (f).
(bug#71929)

; Change `imap-shell-host` docstring to mention SSH

* lisp/net/imap.el (imap-shell-host): Doc fix; mention SSH instead of
rlogin.

Fix bug#70697 with respect to fringe bitmaps

* src/pgtkterm.c (pgtk_draw_fringe_bitmap): Always call
`fill_background_by_face' for clearing backgrounds of fringe
bitmaps.  (bug#70697)

Fix byte-compiler warning in calc.el

* lisp/calc/calc.el
(calc-embedded-open-close-new-formula-alist): Remove previously
introduced quotation marks, as they bring the width of the doc
string past 80.

editorconfig-core-handle.el: Fix regressions in fnmatch handling

* lisp/editorconfig-core-handle.el
(editorconfig-core-handle-get-properties-hash): Fix computation of
relative file name.
(editorconfig-core-handle--fnmatch-p): Handle the case when `pattern`
doesn't have a `/` but does match the `/` character.

Checkdoc fixes in `url/*.el`

* lisp/url/url-util.el (url-query-key-value-allowed-chars):
* lisp/url/url.el (url-retrieve-synchronously): Checkdoc fixes.

Checkdoc fixes in `term/*.el`

* lisp/term/android-win.el (android-clear-preedit-text):
* lisp/term/pgtk-win.el (featurep):
* lisp/term/x-win.el (x-clear-preedit-text): Checkdoc fixes.

Checkdoc fixes in `mh-e/*.el`

* lisp/mh-e/mh-e.el (mh-tool-bar):
* lisp/mh-e/mh-folder.el (mh-folder-mode):
* lisp/mh-e/mh-search.el (mh-pick-menu, mh-search-mode):
* lisp/mh-e/mh-show.el (mh-show-mode): Checkdoc fixes.

Checkdoc fixes in `calc/*.el`

* lisp/calc/calc.el (calc-embedded-open-close-new-formula-alist):
Checkdoc fixes.

Checkdoc fixes in `textmodes/*.el`

* lisp/textmodes/ispell.el (ispell-command-loop):
* lisp/textmodes/mhtml-mode.el (mhtml--construct-submode):
* lisp/textmodes/page-ext.el (pages-set-delimiter):
* lisp/textmodes/refbib.el (r2b-get-field, r2b-put-field):
* lisp/textmodes/refer.el (refer-cache-bib-files):
* lisp/textmodes/reftex-index.el (reftex-index-phrase-selection-or-word):
(reftex-index-phrases-mode):
* lisp/textmodes/table.el (table-insert, table--fill-region-strictly):
Checkdoc fixes.

Checkdoc fixes in `gnus/*.el`

* lisp/gnus/gnus-agent.el (gnus-agent-enable-expiration)
(gnus-agent-with-refreshed-group, gnus-agentize)
(gnus-agent-fetch-headers, gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-art.el (gnus-article-address-banner-alist)
(gnus-default-article-saver, gnus-mime-view-part-as-charset)
(gnus-block-private-groups, gnus-article-edit-mode):
* lisp/gnus/gnus-dired.el (gnus-dired-mode, gnus-dired-attach)
(gnus-dired-find-file-mailcap, gnus-dired-print):
* lisp/gnus/gnus-msg.el (gnus-summary-attach-article):
* lisp/gnus/gnus-score.el (gnus-home-score-file):
* lisp/gnus/gnus-search.el (gnus-search-ignored-newsgroups)
(gnus-search-mu-switches, gnus-search-mu-remove-prefix)
(gnus-search-thread):
* lisp/gnus/gnus-sieve.el (gnus-sieve-string-list):
* lisp/gnus/message.el (message-beginning-of-line):
* lisp/gnus/mm-url.el:
* lisp/gnus/mm-view.el (mm-w3m-setup, mm-setup-w3m):
* lisp/gnus/mml-sec.el (mml-signencrypt-style):
* lisp/gnus/nndiary.el:
* lisp/gnus/nnimap.el (nnimap-server-port, nnimap-use-namespaces)
(nnimap-expunge):
* lisp/gnus/nnmail.el (nnmail-incoming-coding-system):
(nnmail-ignore-broken-references):
* lisp/gnus/nnmairix.el (nnmairix-default-group):
* lisp/gnus/nntp.el (nntp-report):
* lisp/gnus/nnvirtual.el (nnvirtual-update-read-and-marked):
(nnvirtual-partition-sequence):
* lisp/gnus/spam-stat.el (spam-stat-process-directory-age)
(spam-stat-last-saved-at, spam-stat-save):
* lisp/gnus/spam.el (spam-enter-ham-BBDB, spam-check-BBDB):
Checkdoc fixes.

Checkdoc fixes in `eshell/*.el`

* lisp/eshell/em-elecslash.el:
* lisp/eshell/em-extpipe.el:
* lisp/eshell/em-pred.el (eshell-get-delimited-modifier-argument):
* lisp/eshell/esh-cmd.el (eshell--unmark-deferrable)
(eshell-named-command-hook):
* lisp/eshell/esh-module.el (eshell-module--feature-name):
* lisp/eshell/esh-util.el (eshell-find-delimiter): Checkdoc fixes.

Checkdoc fixes in `emulation/*.el`

* lisp/emulation/cua-base.el:
* lisp/emulation/viper-mous.el (viper-parse-mouse-key):
* lisp/emulation/viper.el (viper-major-mode-modifier-list):
Checkdoc fixes.

Checkdoc fixes in `erc/*.el`

* lisp/erc/erc-backend.el (erc-server-parameters):
* lisp/erc/erc-button.el (erc-button--display-error-with-buttons):
* lisp/erc/erc-dcc.el (erc-dcc-member):
* lisp/erc/erc-fill.el (erc-fill-wrap-refill-buffer):
* lisp/erc/erc-speedbar.el (erc-speedbar--last-ran):
* lisp/erc/erc-stamp.el (erc-stamp--current-time):
* lisp/erc/erc-track.el (erc-make-mode-line-buffer-name):
* lisp/erc/erc.el (erc-interactive-display, erc-modules, erc-cmd-CLEAR)
(erc-update-current-channel-member, erc--format-user-modes)
(erc-check-text-conversion): Checkdoc fixes.

Checkdoc fixes in `vc/*.el`

* lisp/vc/ediff-init.el (ediff-start-narrowed)
(ediff-buffer-values-orig-A, ediff-buffer-values-orig-B)
(ediff-buffer-values-orig-C, ediff-buffer-values-orig-Ancestor):
* lisp/vc/ediff-mult.el:
* lisp/vc/ediff-ptch.el (ediff-get-patch-buffer):
* lisp/vc/emerge.el (emerge-before-flag, emerge-after-flag):
* lisp/vc/vc-dav.el (vc-dav-checkin):
* lisp/vc/vc-git.el (vc-git-command):
* lisp/vc/vc-hg.el (vc-hg-command):
* lisp/vc/vc-src.el (vc-src-command):
* lisp/vc/vc-svn.el (vc-svn-command):
* lisp/vc/vc.el (vc-checkin): Checkdoc fixes.

Checkdoc fixes in `emacs-lisp/*.el`

* lisp/emacs-lisp/bytecomp.el (byte-compile-free-vars-warn)
(byte-compile-out):
* lisp/emacs-lisp/eldoc.el (eldoc-documentation-functions):
* lisp/emacs-lisp/find-func.el (find-ert-deftest-regexp):
* lisp/emacs-lisp/macroexp.el (byte-compile-form-stack):
Checkdoc fixes.

Checkdoc fixes in `mail/*.el`

* lisp/mail/feedmail.el (feedmail-mail-send-hook-splitter)
(feedmail-queue-runner-message-sender):
* lisp/mail/mail-extr.el (mail-extr-nuke-outside-range):
* lisp/mail/rmail.el (rmail-automatic-folder-directives)
(rmail-summary-displayed):
* lisp/mail/rmailmm.el (rmail-mime-searching):
* lisp/mail/sendmail.el (mail-mode):
* lisp/mail/supercite.el (sc-mail-last-header-nuked-p): Checkdoc fixes.

Checkdoc fixes in `net/*.el`

* lisp/net/ange-ftp.el:
* lisp/net/dictionary.el (dictionary-tool-bar-map):
* lisp/net/eudc.el (eudc-translate-query)
(eudc-translate-attribute-list)
(eudc-format-inline-expansion-result, eudc-bookmark-server):
* lisp/net/eww.el (eww-check-text-conversion):
* lisp/net/rcirc.el (rcirc-server-name):
* lisp/net/tramp-adb.el (tramp-adb-handle-get-remote-uid):
* lisp/net/tramp-cmds.el (tramp-recompile-elpa-command-completion-p):
* lisp/net/tramp-crypt.el (tramp-crypt-command-completion-p):
* lisp/net/tramp-message.el (tramp-debug-buffer-command-completion-p):
* lisp/net/tramp-sh.el (tramp-use-connection-share):
* lisp/net/tramp.el (tramp-command-completion-p): Checkdoc fixes.

Improve `use-package-vc-valid-keywords` docstring format

* lisp/use-package/use-package-core.el
(use-package-vc-valid-keywords): Improve docstring format.

; * etc/TODO: New item on installing Magit.

; Improve a recent change to the documentation

* lisp/emacs-lisp/comp.el (native-comp-debug):
* doc/lispref/compile.texi (Native-Compilation Variables): Improve
wording.

; Delete fixed item from etc/TODO: "proced on macOS"

The 'process-attributes' function is supported since Emacs 26.1, and
proced seems to be fully working.

* etc/TODO: Delete fixed item: "proced on macOS".

; Delete fixed NS bug from etc/TODO

* etc/TODO: Delete fixed NS bug with 'mouse-avoidance-mode'.
Ref: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=17439#43

Revert "Fix link to major mode variable in docstring"

This reverts commit 73c1252bb6b7cc61d9f992818568d3c57de4ff67.

This will sometimes say
"the variable `(default-value 'global-auto-revert-mode)'".
Problem reported by Eshel Yaron <me@eshelyaron.com>.

* etc/TODO: Add item to convert documentation to 'setopt'.

Prefer 'setopt' in browse-url docs

* lisp/net/browse-url.el:
(browse-url-filename-alist): Doc fix; prefer 'setopt'.

; Improve 'native-comp-debug' documentation

* lisp/emacs-lisp/comp.el (native-comp-debug): Improve doc.
* doc/lispref/compile.texi (Native-Compilation Variables): Likewise.

Correct conditions for iconification on Android

* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity)
<isPaused>: Rename to <isStopped>.
(attachWindow): Adjust to match.
(onPause): Delete function.
(onStop): Deem frames iconified after calls to onStop instead.

Fix execution of MS-Windows app execution aliases in Eshell

* lisp/eshell/esh-ext.el (eshell-script-interpreter): Check for 0-size
files (bug#71655).

Improve 'tab-line-tabs-fixed-window-buffers' sorting performance

* lsp/tab-line.el (tab-line-tabs-fixed-window-buffers): Enhance
'tab-line-tabs-fixed-window-buffers' performance by optimizing buffer
sorting mechanism.  Replace inefficient 'seq-position' calls with a hash
table to cache buffer positions, significantly improving speed when
handling large buffer lists (bug#71958).

Copyright-paperwork-exempt: yes

Adapt Tramp version (don't merge)

* doc/misc/trampver.texi:
* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.

Fix Tramp parser

* lisp/net/tramp.el (tramp-host-with-port-regexp): Declare.
(tramp-set-syntax): Set also `tramp-host-with-port-regexp'.
(tramp-build-host-with-port-regexp): New defun.
(tramp-host-with-port-regexp): Make it a defvar.  (Bug#71972)

* test/lisp/net/tramp-tests.el (tramp-test01-file-name-syntax)
(tramp-test01-file-name-syntax-simplified)
(tramp-test01-file-name-syntax-separate): Adapt tests.

Checkdoc fixes in progmodes

* lisp/progmodes/cperl-mode.el (cperl-file-style)
(cperl-continued-brace-offset, cperl-tips-faces):
* lisp/progmodes/eglot.el (eglot-confirm-server-edits, eglot)
(eglot-list-connections-mode, eglot--outstanding-inlay-hints-region)
(eglot--outstanding-inlay-regions-timer):
* lisp/progmodes/etags.el (etags-goto-tag-location)
(etags--xref-apropos-additional):
* lisp/progmodes/flymake.el (flymake-autoresize-margins):
* lisp/progmodes/gdb-mi.el (gdb-mouse-until, gdb-mouse-jump):
* lisp/progmodes/hideif.el (hif-parse-macro-arglist):
* lisp/progmodes/idlw-help.el (idlwave-html-help-location):
* lisp/progmodes/idlwave.el (idlwave-reserved-word-upcase):
* lisp/progmodes/java-ts-mode.el (java-ts-mode--string-highlight-helper):
* lisp/progmodes/js.el (js--chained-expression-p):
* lisp/progmodes/pascal.el (pascal-mode, pascal-comment-area):
* lisp/progmodes/python.el (python--treesit-fontify-union-types):
* lisp/progmodes/ruby-mode.el (ruby-align-chained-calls)
(ruby-block-indent, ruby-rubocop-use-bundler):
* lisp/progmodes/rust-ts-mode.el
(rust-ts-mode--prettify-symbols-compose-p):
* lisp/progmodes/verilog-mode.el (verilog-cache-has-lisp)
(verilog-auto-insert-lisp, verilog-highlight-region):
* lisp/progmodes/xref.el (xref--get-history): Various checkdoc fixes.

Checkdoc fixes in Org Mode

* lisp/org/ob-core.el:
* lisp/org/ob-exp.el:
* lisp/org/ob-lob.el:
* lisp/org/ob-plantuml.el (org-babel-execute:plantuml):
* lisp/org/ob-python.el (org-babel-python--command)
(org-babel-python-initiate-session-by-key)
(org-babel-python-initiate-session):
* lisp/org/ob-scheme.el (org-babel-scheme-make-session-name):
* lisp/org/ob-tangle.el (org-babel-find-file-noselect-refresh)
(org-babel-interpret-file-mode):
* lisp/org/ob.el:
* lisp/org/org-agenda.el (org-agenda-mouse-1-follows-link)
(org-agenda-start-with-archives-mode)
(org-agenda-previous-line):
* lisp/org/org-clock.el (org-clock-save, org-clock-load):
* lisp/org/org-element-ast.el (org-element-type-p):
* lisp/org/org-faces.el (org-cycle-level-faces):
* lisp/org/org-fold-core.el (org-fold-core--isearch-overlays):
* lisp/org/org-fold.el (org-fold--extend-changed-region):
* lisp/org/org-goto.el:
* lisp/org/org-habit.el (org-habit-show-all-today):
* lisp/org/org-inlinetask.el (org-inlinetask-in-task-p):
* lisp/org/org-macs.el (org-current-text-column):
* lisp/org/org-mobile.el (org-mobile-check-setup):
* lisp/org/org-mouse.el (org-mouse-bolp):
* lisp/org/org-refile.el (org-refile):
* lisp/org/org-src.el (org-src-do-key-sequence-at-code-block):
* lisp/org/org-table.el (orgtbl-after-send-table-hook)
(orgtbl-self-insert-command, orgtbl-to-orgtbl):
* lisp/org/org.el (org-read-date-popup-calendar, org-finish-function)
(org-occur-parameters, org-self-insert-command, org-ctrl-c-ctrl-c-hook)
(org-ctrl-c-ctrl-c-final-hook, org-submit-bug-report)
(org--single-lines-list-is-paragraph):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
* lisp/org/ox-latex.el (org-latex-generate-engraved-preamble):
(org-latex-src--engrave-code):
* lisp/org/ox-publish.el (org-publish-project-alist):
* lisp/org/ox.el (org-export-data): Various checkdoc fixes.

Clarify `checkdoc-max-keyref-before-warn` docstring

* lisp/emacs-lisp/checkdoc.el (checkdoc-max-keyref-before-warn): Clarify
and reflow docstring.  Fix warning about overly long docstring.

* lisp/files.el (insert-directory): Quote switches in wildcard case.

Use shell-quote-wildcard-pattern on the switches string split by
split-string-and-unquote.  This helps to quote such switches as
"--block-size='1" (bug#71935).

Fix uses of 'dired-omit-mode' (bug#71905)

* lisp/dired.el (dired-jump): Disable dired-omit-mode with -1.

* lisp/files.el (recover-session): Disable dired-omit-mode
explicitly afterwards instead of modifying dired-mode-hook
that fails when it contains a lambda.

* src/androidvfs.c (android_saf_check_nonnull): Fix typo.

Correct JNI string error checking and miscellaneous corrections

* src/android-emacs.c (main): Do not attempt to load the
bootstrap class path, which is redundant on all Android releases.

* src/android.c (initEmacs, android_browse_url): Do not assume
exceptions will be raised if GetStringUTFChars fails.  Decode
Android JNI strings as Qandroid_jni.

* src/androidvfs.c (android_saf_check_nonnull): New function.
(android_saf_new_mkdir): Likewise.

Correctly highlight SYMTAB in `awk-mode`

* lisp/progmodes/cc-awk.el (awk-font-lock-keywords): Fix typo for
"SYMTAB" (see Info node '(gawk) Auto-set').

Fix formatting of tables with thead/tfoot but no tbody

Correctly handle formatting of tables containing thead and/or tfoot, but
without any tbody, to prevent including thead/tfoot content twice within
the table's derived body.
* lisp/net/shr.el (shr--fix-tbody): Omit 'thead' and 'tfoot' from
implicit body.  (Bug#71685)
* test/lisp/net/shr-resources/table.html:
* test/lisp/net/shr-resources/table.txt: New tests for table rendering.

(buf_bytepos_to_charpos): Fix mixup introduced in commit b300052fb4ef

Backport of commit 1b595b4598e7 since it turns out this "minor typo"
had disastrous consequences in pathological cases and explains
some of the problems seen in bug#71644 and bug#63040.

* src/marker.c (buf_bytepos_to_charpos): Don't compare byte-positions
with char-positions.

; Reflow "Commentary" in lisp-mnt.el

* lisp/emacs-lisp/lisp-mnt.el: Reflow "Commentary" section.

; * lisp/emacs-lisp/comp-run.el (native--compile-async): Improve warning.

package-buffer-info: Move 'require' earlier

* lisp/emacs-lisp/package.el (package-buffer-info):
Move 'require' earlier, before it is needed.

Fix treesit range rule for jsdoc

The parser for jsdoc is local, so it is necessary for the range
rule to take this into account.
* lisp/progmodes/js.el (js-ts-mode): Add ':local' keyword.
(js-ts-language-at-point): Remove 'js-ts-language-at-point'.
(Bug#71776)

Fix documentation of 'balance-windows'

* lisp/window.el (balance-windows): Doc fix.

* doc/emacs/windows.texi (Change Window): Make the description of
'balance-windows' more accurate.  (Bug#71915)

nnatom: Ensure some parsed values are one line

* lisp/gnus/nnatom.el (nnatom--dom-line): New function.
(nnatom--read-title, nnatom--read-description)
(nnatom--read-article-or-group-authors, nnatom--read-subject)
(nnatom--read-id, nnatom--read-publish, nnatom--read-update)
(nnatom--read-links): Read text using `nnatom--dom-line'.
(Bug#71889)

nnfeed: (Mostly) fix group descriptions

* lisp/gnus/nnfeed.el (nnfeed--group-description): New function.
(nnfeed-request-group-description, nnfeed-request-list-newsgroups):
Use `nnfeed--group-description' and always return t if group data
is found.  (Bug#71888)

Eglot: support deprecated MarkedString (bug#71353)

* lisp/progmodes/eglot.el: Make a markdown code block if
MarkedString passed.

; * doc/lispref/strings.texi (Creating Strings): Followup to last change.

; Fix doc string of 'string-fill'

* lisp/emacs-lisp/subr-x.el (string-fill): Rename LENGTH to WIDTH
and update the doc string accordingly.  (Bug#71856)

Fix returning to original TTY frame after 'rmail-reply'

* lisp/mail/rmail.el (rmail-start-mail): Record the frame from
which an Rmail command, such as 'rmail-mail' or 'rmail-reply', was
invoked.
(rmail--find-orig-rmail-frame): New function.
(rmail-mail-return): Use 'rmail--find-orig-rmail-frame' to find
the original frame, and make it the top frame on its TTY terminal.
(Bug#69738)

Improve warnings from native compiler

* src/comp.c (syms_of_comp) <native-compiler>: Rename from 'comp'.

* src/lread.c (maybe_swap_for_eln):
* lisp/emacs-lisp/comp.el (comp--fwprop):
* lisp/emacs-lisp/comp-run.el
(comp--accept-and-process-async-output, native--compile-async):
Adjust to the new symbol.

Document adding package dependency on Emacs version

* doc/lispref/package.texi (Simple Packages, Multi-file Packages):
Document how to make a package depend on a specific version of Emacs.

Fix file-name detection in Dired under -F

* lisp/files.el (insert-directory-clean): Support all the symbols
appended to file names by the -F/--classify option of 'ls'.  See
https://lists.gnu.org/archive/html/emacs-devel/2024-07/msg00366.html
for the details.

(edebug--called-interactively-skip): Fix bug#71934

* lisp/emacs-lisp/edebug.el (edebug--called-interactively-skip):
Adjust to new interpreted functions.

; * lisp/ibuffer.el (ibuffer-mode): Doc fix.

Fix MS-Windows build with native-compilation

* src/w32.c (globals_of_w32): Move re-initialization of
Vlibrary_cache from here...
* src/emacs.c (main): ...to here, as it must be after load_pdump.
(Bug#71916)

Tag dbus-test05-register-signal-with-nils as unstable

* test/lisp/net/dbus-tests.el (dbus-test05-register-signal-with-nils):
Tag it as unstable.

; * src/w32fns.c (funhook): Restore mistakenly lost line.

Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30

Fix treesit test (bug#71907)

* test/src/treesit-tests.el (treesit-node-check): Re-parse buffer before
checking for node outdated-ness.

Focus more on MS-Windows than MS-DOS in FAQ

* doc/misc/efaq.texi (Editing Windows files): Rename section from
"Editing MS-DOS files", and update the text to focus on Windows.
* doc/misc/efaq.texi (Colors on a TTY)
(Emacs does not display 8-bit characters): Mention MS-Windows before
MS-DOS.

Autoload some string functions

These functions are documented in both `(elisp) Creating Strings' and
'M-x shortdoc RET string RET', so users will expect them to be available
without having to require 'subr-x'.

* lisp/emacs-lisp/subr-x.el (string-fill, string-limit, string-pad)
(string-chop-newline): Autoload.

Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30

* etc/NEWS: Fix typos.

; (grep-read-files): Fix completion table

* lisp/progmodes/grep.el (grep-read-files): Cease returning
some completion candidates unconditionally.  Use
'completion-file-name-table' over 'read-file-name-internal'
because the latter uses 'completion-table-with-quoting', and
that doesn't blend well with other tables in
'completion-table-merge'.

https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg01194.html

Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30

Remove a reference to a non-existant variable from a doc-string

* lisp/progmodes/cc-langs.el (c-opt-extra-label-key): Remove
reference to c-nonlabel-decl-prefix-re from the doc string.

; * src/fns.c (value_cmp): ASCIIfy.

; * etc/NEWS: Fix level of several entrries.

; * etc/NEWS: Fix typo.

; * src/search.c (Fmatch_beginning, Fmatch_end): Doc fix.

; * etc/NEWS: Clarify.

; * src/treesit.c (Ftreesit_query_capture): Fix typo.